Fix the upstream dependency conflict